Get rid of commented code?