fix commands not being removed
Merge branch 'patch/02' into feature/highlight