clean up

cleaned up code, removed redundant code