Removing unnecesary code