Deleted json util since it's required to have ext-json
A little refactoring