Remove commented-out code and delete trailing whitespace