Bib clean up