EAGLESIX-3083: Bugfixes to remove duplicate function and proper create v...

...ia klass instead of this