Removed extra dependencies, still need to remove more