Misc cosmetic changes.
Remove command object
Command class is not available anymore