[[ Bug 13608 ]] Removed unused code