Minor line deletion
Merge branch 'Unify-screen-classes'