Since these are only used by the builder, we can simply update the location of them. I'm not convinced they're all still in use but not convinced enough to remove them.
