Revert "change callback functions type with static method"