refactor remove package