Even more spring cleaning