cleaned up extraneous code