cleanup for new auto-parsing