Cleaned up extra dependencies