Removed daos and pojos