Fix presubmit checks, update for new aedmz API, remove junk.