Remove outcommented stuff