Remove redundant check code
Switch to JSON to commit most stble code