Revert "Cleanup in preparation for configurable designations."

This reverts commit f8b9f9cae65f5e9ab7f79d032eeb3c9f896216a6.