removed all measurement constructor calls