Commenting out more legacy crap that's breaking. Can't wait to destroy
these.