Cleanup in preparation for new parser functions