Super globals refactorings
CodeSniffer should not run through templates
Cleanup