Removed more broken thingsd