Moved timestamp from out of function to in function on cleanup [1699_0e2d622]