Spring cleaning.
- Removed legacy packages