Remove braces, and unused code.