Revert "Main commands"

This reverts commit 661c9134061f88157433871a769ae206a37550c0.