Cleanup
Removed unnecessary dependencies