Clean up of unused settings