Removing SP namespace
Removing tokens and ES stuff