removed redundant code
removed redundant, unused code