Cleanup + make directory init more resilient if schemas are not loaded at init time (Studio effect)