Removed unneeded constructor calls