combine commands into one
Remove  unused commands

* Fix up refactor tests