- fix for compliance
- removed stopState class because of complaint from sonar