bug928676 - Remove unused codes