Removed some more stuff.