removed unnecessary crap