diff --git a/_data/team.yml b/_data/team.yml
index 747f3c3b..75aaa03d 100644
--- a/_data/team.yml
+++ b/_data/team.yml
@@ -1,12 +1,12 @@
 # Team member names, titles and social links
-- name: Stella Rouzi 
+- name: Stella Rouzi
   pic: stella
   position: Developer
   social:
     - title: github
       url: https://github.com/differentreality
     - title: linkedin
-      url: http://gr.linkedin.com/pub/stella-rouzi/14/354/123 
+      url: https://gr.linkedin.com/in/differentreality
 
 - name: Christian Bruckmayer
   pic: chris
@@ -14,6 +14,10 @@
   social:
     - title: github
       url: https://github.com/ChrisBr
+    - title: twitter
+      url: https://twitter.com/bruckmayer
+    - title: linkedin
+      url: https://www.linkedin.com/in/bruckmayer/en
 
 - name: Henne Vogelsang
   pic: henne
@@ -22,42 +26,11 @@
     - title: globe
       url: http://www.hennevogel.de
     - title: twitter
-      url: https://twitter.com/henne 
+      url: https://twitter.com/henne
     - title: github
       url: https://github.com/hennevogel
     - title: linkedin
-      url: https://de.linkedin.com/in/hennevogel
-
-- name: Gopesh Tulsyan
-  pic: gopesh
-  position: Developer
-  social:
-    - title: globe
-      url: http://www.67street.in
-    - title: github 
-      url: https://github.com/gopesht
-
-- name: Artem Chernikov
-  pic: artem
-  position: Developer
-  social:
-    - title: twitter
-      url: http://twitter.com/skullzeek
-    - title: github 
-      url: https://github.com/kalabiyau 
-    - title: linkedin
-      url: http://de.linkedin.com/in/achernikov
-
-- name: James Mason
-  pic: james
-  position: Developer
-  social:
-    - title: globe 
-      url: http://bear454.com
-    - title: twitter
-      url: http://twitter.com/bear454
-    - title: github 
-      url: https://github.com/bear454 
+      url: https://de.linkedin.com/in/hennevogel/en
 
 - name: Matt Barringer
   pic: matt
@@ -71,4 +44,3 @@
       url: https://github.com/mbarringer
     - title: linkedin
       url: http://de.linkedin.com/in/mattbarringer
-