Remove some deprecated code