core-1667 removed unused code