Remove a few of ORM calls from Controller to Model

Try to simplify the Controller layer