README update for the new JSON config
Cleanups
Remove test cruft