Massive cleaning

A lot of this code was hastily added to "Get to a green state" for most builds, however, I feel like an in depth audit is needed to remove a lot of legacy paradigms... Cleaning too much will likely make it hard for people to "transition" to this fork, but that testing can come later.