removing unnecessary cookies/states, #102