Review, cleanup and refresh of integration section