Cleanup, concrete data

Removed some dead code and comments.
Started working on the concrete output data.