UI-772: Removed unused code