[[ Bug 13121 ]] Removed unused code