contrib cleanup