Removed references to StaticPublisher where no longer needed
Fixes for 3.1 support, and removing more staticpublisher crud
Merge branch 'ss3'