A quick save to remove some test controls