Cleanup/lock3