Removing additional dependencies
Fixing some issues.