Remove commands and fix tabs