Remove now-unused function.
Add missing callback.