cleaning up schema loading after refactor