v2 notices, cleanup