Plugin cleanup and rumaging