Executors have stopped working
Removed ActivityMapServices and ActivityMapCache - now persisting
alongside the Activity