Remove "sample" mark & measure calls