clean up some fields for users and organisations