clean up, removed redundant code