added 'just leave' functionality when all questions answered
removed yellow warnings
removed unused matcher service