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: Ibbf8c3791d1194ce3b0c7c5b69044106ed3fb358