Fix session splitting (again), cleanup