clean up of commented code