Another good catch. Just did that, removing the helpers & associated tests as well.