Eliminate unnecessary callbacks