more not-spring cleaning