more coffee cleanup