[Core, Locking]: Remove locks not needed any more to prevent a memory leak