removed more stuff that shouldnt have been there