remove unused context var
move org lookup
update test