Removed implementation for circular dependencies;

Minimized some code;