Removed  a few dependencies