Some package cleanup