0491: spring cleaning part 3