Don't delete plugins until cleanup, instead of after execution