Clean up for minimal plugin requirement.