started removing unnecessary copies of module code within samples