* resolving some dependencies
* resolving dependencies
* code cleanage
- removing obsolete functions and modules