Cleaned up settings window and deleted zombie code