SPLEVO-389 Removed unused code