Commandiq cleanup

@yields @gjohnson