Remove some deprecated code. #nocodesmell