Revert "More coffee additions"

This reverts commit 4a0fb2258e3fa8704377351ac66d133af2e874e2.