fixed pending callback strategy, further cleanup