Added option to remove command types