Removed obsolete screens.
Merge pull request #21 from MattiasBuelens/cleanup-obsolete

Removed obsolete screens.