Removal of excess code