Removed mentions to executor service as threads are now being manually managed so they can be run synchronously