Plugin cleanup, progress commit