General package cleanup