Fixed duplicate stop issue caused by preloading data
Added filter to mutable set removal to prevent crash in some situations
Merge pull request #385 from MIT-Mobile/3.6/dev-intrepid-lwright-shuttles

Fixed duplicate stop issue caused by preloading data