VBID-1703 Remove number_of_screens