Remove non essential code