Clean-up of commented code.