Fix timestamps round 2
remove unused code