cleaning up extraneous code