Remove excess ORM query