Version 3

clean up delivery -> session