A little more spring cleaning