Merge "BUG-865: removed unused code."