diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index 0841e1e..31edf28 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -24,7 +24,6 @@ Name:		xorg-x11-fonts
 Version:	7.5
 Release:	11%{?dist}
 License:	MIT and Lucida and Public Domain
-Group:		User Interface/X
 URL:		http://www.x.org
 
 BuildArch:	noarch
@@ -84,7 +83,6 @@ X.Org X Window System fonts
 
 %package misc
 Summary: misc bitmap fonts for the X Window System
-Group: User Interface/X
 Requires(post): mkfontdir, fontconfig
 Requires(postun): mkfontdir, fontconfig
 # Still required by xfig-common, xosd, xtide
@@ -97,7 +95,6 @@ fonts for use with X Window System.
 #--------------------------------------------------------------------------
 %package Type1
 Summary: Type1 fonts provided by the X Window System
-Group: User Interface/X
 Requires(post): mkfontdir, fontconfig, ttmkfdir
 Requires(postun): mkfontdir, fontconfig, ttmkfdir
 
@@ -108,7 +105,6 @@ distribution.
 %if %{with_ethiopic_fonts}
 %package ethiopic
 Summary: Ethiopic fonts
-Group: User Interface/X
 Requires(post): mkfontdir, ttmkfdir, mkfontscale, fontconfig
 Requires(postun): mkfontdir, ttmkfdir, mkfontscale, fontconfig
 
@@ -118,7 +114,6 @@ Ethiopic fonts which are part of the core X Window System distribution.
 #--------------------------------------------------------------------------
 %package 75dpi
 Summary: A set of 75dpi resolution fonts for the X Window System.
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -127,7 +122,6 @@ A set of 75 dpi fonts used by the X window system.
 #--------------------------------------------------------------------------
 %package 100dpi
 Summary: A set of 100dpi resolution fonts for the X Window System.
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -136,7 +130,6 @@ A set of 100 dpi fonts used by the X window system.
 #--------------------------------------------------------------------------
 %package ISO8859-1-75dpi
 Summary: A set of 75dpi ISO-8859-1 fonts for X.
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -145,7 +138,6 @@ Contains a set of 75dpi fonts for ISO-8859-1.
 #--------------------------------------------------------------------------
 %package ISO8859-1-100dpi
 Summary: A set of 100dpi ISO-8859-1 fonts for X.
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -154,7 +146,6 @@ Contains a set of 100dpi fonts for ISO-8859-1.
 #--------------------------------------------------------------------------
 %package ISO8859-2-75dpi
 Summary: A set of 75dpi Central European language fonts for X.
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -163,7 +154,6 @@ Contains a set of 75dpi fonts for Central European languages.
 #--------------------------------------------------------------------------
 %package ISO8859-2-100dpi
 Summary: A set of 100dpi Central European language fonts for X.
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -172,7 +162,6 @@ Contains a set of 100dpi fonts for Central European languages.
 #--------------------------------------------------------------------------
 %package ISO8859-9-75dpi
 Summary: ISO8859-9-75dpi fonts
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -181,7 +170,6 @@ Contains a set of 75dpi fonts for the Turkish language.
 #--------------------------------------------------------------------------
 %package ISO8859-9-100dpi
 Summary: ISO8859-9-100dpi fonts
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -190,7 +178,6 @@ Contains a set of 100dpi fonts for the Turkish language.
 #--------------------------------------------------------------------------
 %package ISO8859-14-75dpi
 Summary: ISO8859-14-75dpi fonts
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -200,7 +187,6 @@ provide Welsh support.
 #--------------------------------------------------------------------------
 %package ISO8859-14-100dpi
 Summary: ISO8859-14-100dpi fonts
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -210,7 +196,6 @@ provide Welsh support.
 #--------------------------------------------------------------------------
 %package ISO8859-15-75dpi
 Summary: ISO8859-15-75dpi fonts
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -220,7 +205,6 @@ provide Euro support.
 #--------------------------------------------------------------------------
 %package ISO8859-15-100dpi
 Summary: ISO8859-15-100dpi fonts
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -230,7 +214,6 @@ provide Euro support.
 #--------------------------------------------------------------------------
 %package cyrillic
 Summary: Cyrillic fonts for X.
-Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
 
@@ -277,8 +260,6 @@ done
 
 #--------------------------------------------------------------------------
 %install
-rm -rf $RPM_BUILD_ROOT
-
 for dir in *; do
     make -C $dir install DESTDIR=$RPM_BUILD_ROOT
 done