Fix recursion bug in WallCleaner