commit before taking out unused controls