Remove some settings from master