First changes
Removed a TON of un-needed imports. A result of the jenkins-utils migration
Removed un-used test
Use new escape character