Remove some stuff we never used