drop grunt
ensure CC optimizer does not rewrite these tokens
fix refactoring that broke the queue