formatting and remove block falling back to EclipsePluginRegistry (which
no longer exists)