Remove duration and put it in state where it belongs