Clean up extraneous config