Remove Excess Code