Contrib cleanup