Dependency packages are now loaded before the main package

* Removed some unused code