Removed messageService dependency from solverService
Minor improvements