[[ Bug 9940 ]] Removed some redundant code