Removed dead procedural code

Depends on https://gerrit.wikimedia.org/r/#/c/63126/

Change-Id: Ic85d9494ba5bda6bfe2a1575b458d3ca156ba64f
Merge "Removed dead procedural code"