Remove commented out code and some whitespace.