remove locke, decom

follow-up https://gerrit.wikimedia.org/r/#/c/112587/
and RT #6168

Change-Id: I387839b9d0f1ffa53c983441a24a5c49e0e5edaa
Merge "remove locke, decom"