Remove useless measure and log code