Migrate over to source format 3.0 and drop dpatch