Cleanup deprecated code.