Revert "DIY framework"

This reverts commit 2bf014ffd015f093dd6f90fdb00d1d0ead07b363.