Don't change message wrapper command in enrich steps. Cleanup imports