Remove some old callback stuff