cookie fix
remove getter/setter
Merge branch 'cleanup' into develop