Cleanup, and initial version of checks.json