remove unused parameter
Added checks into ctor