Remove some unused values and stuff