Remove old state handling.