Generator cleanup
cleanup Parser