ref #4154 - after review cleanup