Added cache on organization to avoid double persist (& critical bug)
Removed useless historical code