FEATURE: more spring cleaning