Shouldn't these calls be removed in DEV?