remove things that are no longer needed; add new build tags

[frederikhors]

[joncalhoun]

I have incredibly limited bandwidth, so at this point I'd like to avoid any changes that aren't absolutely necessary, especially without a working CI build to verify changes. I don't see anything in here that isn't a cosmetic a refactor, and if I am being honest I don't agree with all of the refactoring, so I'm going to hold off on this for now.