Add functionality to remove controls
Fix removal code
Add unit test for the internal state after removing controls
Merge pull request #316 from stanhu/remove-controls

Add functionality to remove controls