clear old code and adapted fedora16 version.