Removed obsolete code as suggested by Mozilla