Final changes to remove Jira dependency