unstate() support and cookie terms cleanup