Massive cleanup for annotations