#118 - remove duplicate classes in models/helpers/lib