Remove some packages
Add some extra packages