Remove extra call back