Trying to prune some unnecessary calls