[development] Cleaning up code for Fedora Packages