Remove buffer results
Task 2 with ServiceState working OK