Revert "remaining files include some middleman stuff."

This reverts commit 383d37d2011b2bb63b1fba4a6674b8f12bf98ca9.