removed internal references to plugins