services/impl/da revision + code clean up