Clean up core and ui settings