Remove ORM dependency