cleaned up cruft
index on timestamp