remove indirection (dao/service wrappers classes)