cleanup of parser*.go