Cleanup a bunch of now-deprecated code...