RMT command clean-up