Clean up some extraneous code