Revert "Build 21 v2"

This reverts commit 90e7aa9943e678e43f0c5f6460956cf37a277359.
Build 21 v3

Got rid of all the useless junk, finally