fixed #3716 - add support for removing commands