Remove weird model logic from loader