Remove Redundant Code