cleaned up
upgraded to 6.0
updated jira to 6.0