fix for UoW pattern, cleanup