Revert "Massive decluttering."

This reverts commit 09f266e6e9f035883778605e37ee987022499232.