more work on post upgrade script
Added extra tidying - org roles