Cleanup, from Emanuele Giaquinta <exg@gentoo.org>