cleaning up controls