Remove more bake-provided hard-coded paths