Package updates plus trimming out some not needed bits