refactored the add/remove controls to single statements and pushed the complex removeacontrol to core.