Removed Sunspot / Added PG
Merge branch 'Remove-Sunspot-TOTALLY'