Removed more crap