Remove the code which attempted to try for 10 seconds

Also, persist etag for sshKeys across method calls.