Remove non-essential code