Further plugin cleanup