Removed some dependencies