Cleaning up rendering fields, settings, repos...