refactor and clean up of reported items

There are only a couple of thing to kill of before the next major push on this part of the spine.