Removing ENLIGHT traces and refactoring.