Bug 1024715 - Removing teardowns R=zacc,bebe