clean up AggressiveDefaultDict
simplify data provider