Cleaned up deprecated code.