- Removed Unneeded packages
- Cleaned up error messages