RMT-187

Removed redundant code