Merge "Remove unused fields and move ProfileSelect to Settings"