use notification aggregation class
cleanup