Fists changes

Removed unnecessary code and fixed issue with Silverlans SNPC addons