Removed lots of redundant dependencies