Generalize parser
Remove unused parser