issue-3268 Removed unused code