removed entities and state machine