Replaced / removed deprecated code