Remove unnecessary diagnostics.   Fix missing interactor