Remove controls
Whitespace cleanup