add missing vars
remove unused callback