More non-essential code trimming