Bug 1014318: Removing usused code r=aki