Fixed ZEN-11591 issue

Unwanted code should be removed, not commented out. That also goes for the rest of the changes in this commit.