Removed some more stuff