Feature/coffee cleanup - Merge into develop branch.