More unnecessary code removing:

Empty namespaces: close #2
Defines: close #3