Merge "Settings cleanup"