remove comments, consistency for callbacks