Removed more stuff...