More getting rid of screenstatemachine