1) no need; this is now automatic. Are there other places?
2) no need for persistence-....; discuss with Cristina