Removed plusplus
More deps