#118 cleanup of scanner plugin structures