Revert "WIP: Building frame layer abstraction"

This reverts commit 69a28d31ecd1b14b6d03c6f134fa31b691c5bac2.