Removed -- cruft and fixed timestamp(14)

A start