address issues
remove callback