remove console logs, and add callback checks