Clean up things that should be in configs