Remove StateMapping