Remove commands and fix verboseness