remove unused classes and rename NewScreen event to ScreenToDisplay