Cleaned up deprecated code