removing a lot of deprecated code