change the callback mechanism
remove polling mode