cleanup and state change 201303081106