Added clearing timestamp in extra places.