Initial plugin cleanup