Bug 946173 - (v1.1hd) Remove unused files +shepherd