updated to remove ENV monkey patching
removed deprecation countdown and ENV monkey patching