Removed some controls...

As a result of the recent Add/Rename refactor, these were no longer
really required.