removed more stupid things