Remove :session codename dependency (commented out as early, not wrong)