[Defines] About to remove all defines
Merge branch 'master' of https://github.com/tcew/OCCA2