Removes more Issue occurances.

This also resolves some old TODOs for when Issues are finally removed.