Dependency redistribution
Removing unused dependency
Calling main directly so proper childprocess can be terminated