Next step of Clean Up:

* I used Clean Up on the package drift
* I fixed all warnings at the cleand up packages