cleaning up DAO layer