Remove unused libraries
Remove packages
Improved client logic