Version 5

delivery -> session cleanup