Clean up pre-coffee nonsense