Removed screen arguments in all classes.