Fixed world model obstacle removal (hopefully)
Cleaned up for loop termination