More Spring cleaning

But it's not Spring. So... !Spring cleaning