Removed extra from Node Group

Extra is now calculated in the method where is is needed.

Change-Id: I554732e5efeb273aae17dd134fd0e0ac0511185e
Merge "Removed extra from Node Group"