Remove unecessary commented-out code