[[ Bug 13659 ]] Removed unused code