removed extraneous stuff
removed old method