Gutting a ton of old legacy crap