Cleanup. Bumped to current plugin.