Cleanup parsing classes and tests