more package cleanup and stroup examples