Before Refactoring: dropping demand- and supplyprofile