WIP: Rendered dictionary definition

Remove quite a bit of debugging code