Remove unused packages
Add more stuff