Sailfish packaging code cleanup