Removed redundant dependencies
Removed unused refferences