Removing hybrid templates and sample apps