Fixed generating extra/unnecessary cookie files