Update code comments with regard to callback removal