Remove depracted constructors from classes and use new ones