Removing legacy junk
Continuing refactor. Getting to a more approachable abstract state