Cleanups and dates in state