Cookie handling cleanup