clean up packages and add coffee goodness