Removed more stuff