Feature/contrib cleanup