Refactor commands code and utilities to issue callbacks and remove none needed vars
Comment out code