removes lots of long since deprecated code