Clean up
Coffee switch completed