Added dashboard cleanup