removed callback per code review