Removed -- cruft and fixed timestamp(14)