CHANGE: Update various methods to use the new population/demand measures rather than the old levels
CODE: Remove some deprecated code.