Clean up the code.

1 job for save-public-keys in 2 minutes and 53 seconds (queued for 1 second)