Revert "Refactor Model to use DAO Pattern"

This reverts commit c89149ae09acb63a347aa0a7cad260bddfdb7685.