Clean up tea types