Cleaning up the breakage from the refactor, removed extra logs and reordered the tag #'s used for debugging.