Removing unrequired code