Remove extraneous & deprecated locking infrastructure.