Upgraded clean plugin.