diff --git a/system/base/util-linux/pspec.xml.new b/system/base/util-linux/pspec.xml.new
deleted file mode 100644
index aefea02f..00000000
--- a/system/base/util-linux/pspec.xml.new
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
-<PISI>
-    <Source>
-        <Name>util-linux</Name>
-        <Homepage>http://userweb.kernel.org/~kzak/util-linux-ng/</Homepage>
-        <Packager>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Packager>
-        <License>GPLv2</License>
-        <IsA>app:console</IsA>
-        <IsA>library</IsA>
-        <Summary>Various useful Linux utilities</Summary>
-        <Description>The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function.</Description>
-        <Archive sha1sum="73aee8f0ecc5f25c206a92e0c6ed7f14a5e01d66" type="tarxz">https://www.kernel.org/pub/linux/utils/util-linux/v2.26/util-linux-2.26.1.tar.xz</Archive>
-        <BuildDependencies>
-            <Dependency>zlib-devel</Dependency>
-            <Dependency>udev-devel</Dependency>
-            <Dependency>python-devel</Dependency>
-            <Dependency>libudev-devel</Dependency>
-            <Dependency>shadow</Dependency>
-            <Dependency>ncurses-devel</Dependency>
-            <Dependency>libcap-ng-devel</Dependency>
-            <Dependency>glibc-32bit</Dependency>
-            <!-- <Dependency releaseFrom="2">utempter-devel</Dependency>-->
-        </BuildDependencies>
-        <Patches>
-             <!--<Patch level="1">ntfs-3g.patch</Patch>
-            <Patch level="1">0001-libmount-FS-id-and-parent-ID-could-be-zero.patch</Patch>
-            <Patch level="1">0001-switch_root-verify-initramfs-by-f_type-not-devno.patch</Patch>
-            <Patch level="1">move_is_mountinfo.patch</Patch>-->
-            <!-- makeing /var/log/lastlog -->
-             <Patch level="1">upstream/util-linux-ng-2.21-login-lastlog.patch</Patch>
-	 </Patches>
-    </Source>
-
-    <Package>
-        <Name>util-linux</Name>
-        <RuntimeDependencies>
-            <Dependency version="current">libuuid</Dependency>
-            <Dependency version="current">libblkid</Dependency>
-            <Dependency>zlib</Dependency>
-            <Dependency>perl</Dependency>
-            <Dependency>python</Dependency>
-            <Dependency>ncurses</Dependency>
-            <Dependency>libudev</Dependency>
-            <!--<Dependency>utempter</Dependency>-->
-            <Dependency>libcap-ng</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="config">/etc</Path>
-            <Path fileType="executable">/bin</Path>
-            <Path fileType="executable">/sbin</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="executable">/usr/sbin</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="man">/usr/share/man</Path>
-            <Path fileType="info">/usr/share/info</Path>
-            <Path fileType="data">/usr/share/misc</Path>
-            <Path fileType="data">/usr/share/getopt</Path>
-            <Path fileType="data">/usr/share/bash-completion/completions</Path>
-            <Path fileType="localedata">/usr/share/locale</Path>
-            <Path fileType="header">/usr/include</Path>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="library">/lib</Path>
-        </Files>
-	 
-    </Package>
-
-    <Package>
-        <Name>uuidd</Name>
-        <IsA>service</IsA>
-        <IsA>app:console</IsA>
-        <PartOf>util.misc</PartOf>
-        <Summary>Helper daemon to guarantee uniqueness of time-based UUIDs</Summary>
-        <RuntimeDependencies>
-            <Dependency>libuuid</Dependency>
-        </RuntimeDependencies>
-        <!-- FIXME: Add COMAR service -->
-        <Files>
-            <Path fileType="executable">/usr/bin/uuidgen</Path>
-            <Path fileType="executable">/usr/sbin/uuidd</Path>
-	    <Path fileType="config">/usr/lib/tmpfiles.d/uuidd.conf</Path>
-            <Path fileType="man">/usr/share/man/man1/uuidgen.1</Path>
-            <Path fileType="man">/usr/share/man/man8/uuidd.8</Path>
-        </Files>
-        <AdditionalFiles>
-            <AdditionalFile target="/usr/lib/tmpfiles.d/uuidd.conf" permission="0644" owner="root">uuidd.tmpfiles</AdditionalFile>
-        </AdditionalFiles> 
-    </Package>
-
-    <Package>
-        <Name>libuuid</Name>
-        <IsA>library</IsA>
-        <Summary>A library for UUID processing</Summary>
-        <Files>
-            <Path fileType="man">/usr/share/man/man3/uuid*</Path>
-            <Path fileType="library">/lib/libuuid.*</Path>
-            <Path fileType="library">/usr/lib/libuuid.so</Path>
-        </Files>
-    </Package>
-
-    <Package>
-        <Name>libuuid-devel</Name>
-        <IsA>header</IsA>
-        <PartOf>system.devel</PartOf>
-        <Summary>libuuid header files</Summary>
-        <RuntimeDependencies>
-            <Dependency release="current">libuuid</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="header">/usr/include/uuid/*</Path>
-            <Path fileType="data">/usr/lib/pkgconfig/</Path>
-            <Path fileType="data">/usr/lib32/pkgconfig/uuid.pc</Path>
-        </Files>
-    </Package>
-
-    <Package>
-        <Name>libblkid</Name>
-        <IsA>library</IsA>
-        <Summary>A library for block device identifying</Summary>
-        <RuntimeDependencies>
-            <Dependency>libuuid</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="man">/usr/share/man/man3/libblkid*</Path>
-            <Path fileType="man">/usr/share/man/man8/blkid*</Path>
-            <Path fileType="library">/lib/libblkid.*</Path>
-            <Path fileType="library">/usr/lib/libblkid.so</Path>
-        </Files>
-    </Package>
-
-    <Package>
-        <Name>libblkid-devel</Name>
-        <IsA>header</IsA>
-        <PartOf>system.devel</PartOf>
-        <Summary>libblkid header files</Summary>
-        <RuntimeDependencies>
-            <Dependency release="current">libblkid</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="header">/usr/include/blkid/*</Path>
-            <Path fileType="data">/usr/lib/pkgconfig/blkid.pc</Path>
-            <Path fileType="data">/usr/lib32/pkgconfig/blkid.pc</Path>
-        </Files>
-    </Package>
-
-    <Package>
-        <Name>libuuid-32bit</Name>
-        <PartOf>emul32</PartOf>
-        <Summary>32-bit shared libraries for libuuid</Summary>
-        <BuildType>emul32</BuildType>
-        <RuntimeDependencies>
-            <Dependency>glibc-32bit</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="library">/usr/lib32/libuuid.*</Path>
-        </Files>
-    </Package>
-
-    <Package>
-        <Name>libblkid-32bit</Name>
-        <PartOf>emul32</PartOf>
-        <Summary>32-bit shared libraries for libblkid</Summary>
-        <BuildType>emul32</BuildType>
-        <RuntimeDependencies>
-            <Dependency release="current">libblkid</Dependency>
-            <Dependency release="current">libuuid-32bit</Dependency>
-            <Dependency release="current">libuuid</Dependency>
-            <Dependency>glibc-32bit</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="library">/usr/lib32/libblkid.*</Path>
-        </Files>
-    </Package>
-
-    <History>
-        <Update release="8">
-            <Date>2015-04-01</Date>
-            <Version>2.26.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="7">
-            <Date>2014-05-11</Date>
-            <Version>2.24.1</Version>
-            <Comment>Release bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="6">
-            <Date>2014-04-08</Date>
-            <Version>2.24.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="5">
-            <Date>2014-01-20</Date>
-            <Version>2.24</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="4">
-            <Date>2013-07-27</Date>
-            <Version>2.22.2</Version>
-            <Comment>Move pc files to devel pack, rebuild</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
-        <Update release="3">
-            <Date>2013-07-26</Date>
-            <Version>2.22.2</Version>
-            <Comment>Release bump for rebuild.</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
-        <Update release="2">
-            <Date>2013-01-14</Date>
-            <Version>2.22.2</Version>
-            <Comment>New release</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
-        <Update release="1">
-            <Date>2012-11-17</Date>
-            <Version>2.22.1</Version>
-            <Comment>First release</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-    </History>
-</PISI>
diff --git a/system/boot/grub2/pspec.xml b/system/boot/grub2/pspec.xml
index df0979b5..248fbd26 100644
--- a/system/boot/grub2/pspec.xml
+++ b/system/boot/grub2/pspec.xml
@@ -26,7 +26,6 @@
             <Dependency>help2man</Dependency>
             <Dependency>texinfo</Dependency>
             <Dependency>freetype-devel</Dependency>
-            <Dependency>freetype</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>ncurses-devel</Dependency>
             <Dependency>xz-devel</Dependency>