Merge "Remove legacy code for Home root"