Remove references to callback