Json cleanup

This is the remains of the RIPD-266 code, put into a simple cleanup...