plugin dispatcher tidy up