This drops a lot of now common definitions. This is still just prepratory work before using the v1-multi code itself.