Cleanup, sync Resources and settings.yml