Remove some dead-weight and built-up gunk