Cleanup and locks are ok now.
[TODO] cleanup done