Make removing work
Remove node locks