WIKI-846: Removed unused code (after WIKI-748)