Remove unnecessary indicator cloning