removed more stuff