Cleanup of cookies related code
Merge pull request #26 from vert-x3/cookies_cleanup

Cleanup of cookies related code