Cleanup on deactivation

To avoid conflicting with my other pull requests, this branch was branched off of my enable_ie_support branch. Check the last commit for changes related to this pull request.
Please see my last comment.