Clean up extraneous code