Removed primary ctor usage