Closes-Bug: #1358754
Removed the references to the old code/configuration.
The issue happened when upgraded from older 1.05 to newer 1.10.
Some of the older files were left as such, which caused the script
to misbehave.

Change-Id: Ifdab6c10220047ea8507c87e30e07b02165f5e1b