Remove Unnecessary code