Cleanups

This prepares the ground for the ".pc" patches.