Cleaning up unused code
adjusting tests
Adjusting parser rules