Remove unused packages
Add new preferences and comments