Remove bullshit and let d2-common do the work