More cleanup; work with timestamps