removed redundant crap