Revert "lock -> json"

This reverts commit f405abe5549a39bb1d50790861c84f4d9535c541.
Revert "Allow no lock file"

This reverts commit a56fea0b587b73ff83352ec88208b815fc07967e.