Server package clean up