0477: spring cleanup, part deux