remove measure + updated todo