Clean up remnants of non-main runtime

[jamesnetherton]

Description

We still have a lot of build time code in core that is a legacy of when we had support for the non-main runtime.

We should try to clean it up and reorganise things so that it's more coherent.