Topic/strip provided packages

fix for #224 (this is duplicating issues, but it might be easier to view the changes this way?)