Fixed: Ensure old commands are removed