more cleaning
Finish cleaning compiler directives.