Fixed remove and add callback so they properly handle nested callbacks