Close #18 Remove commands which are usable as button