Updating to new concurrent-ontapi
- and removing concurrency locks from portal