Sure, wanted to make sure the the PR gets in first before starting to remove those functions, because that will surely touch some more code.