Soham | BSHR-346 | Removed unnecessary extra vars.