round 2 of humanization cleanup