cleanout after merge from coffee branch