CE-1018 Get rid of an unnecessary Helper class