We don't really use them (often) and there's no active locks, so I'm
inclined to want to do the latter.
Killing locks entirely sounds reasonable if we don't use them and don't
plan to use them anytime soon[1].
Regards,
CoE
[1] i.e. before we move to git :P