getting rid of session references in strategy