Clean up the settings classes