Revert "Bootstrap Addition"

This reverts commit 76396ff996ec1e8bd01b59303c84c4d379fcabc5.
Simplified design update based on GLWalker