Remove accidental import from ProtocolObjectFactory.
Fix imports in TaskSubmit.