Removing Affinity from SP edition

Change-Id: I0ad21f92846a15d8ed24249039ce803437f9a0bc
Signed-off-by: Luis Gomez <ecelgp@gmail.com>