TODO cleanup
removed many unnecessary calls to <cp> in grammar
removed some code that was emitting warnings