Clean up extraneous