removing unnecessary cookies/states, #120