SCRUM#393: Removes configuration files that change the system in an...

SCRUM#393: Removes configuration files that change the system in an undesirable way and makes minor modifications to the code to avoid undesired operation