Update to double command removal