Removed Screen dependencies and service accounts