Remove/And some packages
Add macro