Remove some misc stuff