removed pointless state switching