Stop reading from legacy state path

In order to drop the legacy unit state code altogether, we need to stop reading from it. This change removes the two last places that access the legacy location.
Done. That was way easier than expected.