Removed a lot of the code in StrategyManager and some parts using it
Added the previous behaviour for expanding, even though it should be changed again soon
Merge branch 'remove-old-strategy' into develop