Feature/46 cleanup sessions