Clean up controls