Remove old g+ stuff from bad merge