updated service screens to 2.4 and removed some junk