Revert "add more comand producer"

This commit is buggy, and could be useful, please double-check before
commiting

This reverts commit 5c89a2528eae65c2c120016e9e160ffa6a423e9e.