Removal of unrequired code