remove deprecated constructor calls
readd exceptions