Redundant code remove