removed coffee references from latest merge