#17 Remove Remaining Hardcoded Scenarios