[[ Bug 13979 ]] Removed commented out code