removed lots of unneeded code & deps