Removes the old interface which was only a shim to the new one anymore.
HW locks are expected to eventually succeed or immediately return (if requested).
