Remove double unlock

in order to avoid hangs here.

Note: Also re-ordered imports. Are you using an old version of `goimports`? I can drop this change, if you don't want it.