pulled in mozilla changes, cleared out cruft