Fix user time saving
cleaning code