Remove unused variables and clean up callbacks
Remove unused variables and clean up callbacks

[MODULUS-501]

XervoIO/cli,onmodulus/modulus-cli,XervoIO/cli,XervoIO/cli,onmodulus/modulus-cli,onmodulus/modulus-cli