Clean up and remove unused settings