Revert "fixes"

This reverts commit b7e8b86ed0a7774356c74726f963827f9cbeb4a5.
Revert "twrp and goo support", won't build for some reason, will look into later"

This reverts commit 365186763e7a8b1df191f684421e16014b39b4b9.