removed TODO's from DAO layer