Finish up PR #3816

cleanup a few more pylabs