Cleanup and adding self link to IssuesState