Removed old classes. Removed Screen