Moving legacy calc_id to EntryMetadata instead, and some cleanup

13 jobs for v1-test-entry-refactor in 39 minutes and 50 seconds (queued for 3 seconds)