Remove old state handling code.