Remove some stuff that's no longer used