Changed how screens are removed