Cleanup in CustomSettings.java