BUG-981: remove deprecated use of constructors