remove commented out code whose equivalent is mostly implemented