Remove some stuff not currently in use