Remove some unused values