EAGLESIX-3083: Bugfixes to remove duplicate function and proper create via klass instead of this