Removing erroneous comments and commented-out code