Fix two bugs: mis-use of safeCall and didn't remove a callback