removed more stuff...