d2-common: clean up

Change-Id: I62cf97e7397b619c48d55c2c13d5623933cfd20c