Remove lots of commented code