Revert "Introduce various new components in preparation for future optimizations."

This reverts commit ca4af33e6b033bfbd477005a2f63f656330f9028.