Removed more stuff I don't use