Fix MAGN-3218 Walls created on first run are not cleaned up
Merge pull request #1867 from Randy-Ma/magn-3218

Fix MAGN-3218 Walls created on first run are not cleaned up