Cleaning up extraneous code