Cleanup
Add PEG parser
Remove Parser pending further development