removed redundant things
removed redundant things