Clean up + SettingsActivity