scenario builder cleanup