Cleaning up shared/hybrid (should have gone when we got rid of hybrid sample apps)