Add functionality to remove controls