Settings changes and final cleanup