Remove Redundant code.
Make things simple.