Cean up callbacks after addresses #22