Removed useless lines as per code review from dave (via email)
Removed useless lines from test spec as per code review from dave (via email)
Merge branch 'master' into 2.32rc