Replaced EywaService with SingleThreadExecutor and started cleaning up dead references