Remove time measurement
Remove old label