some cleanup....
but it appears that timestamp is not trustable