Remove more ids and replace with 'js-' hook classes
Remvoe dead code
Clean up controls view code