[packages] final round of cleanups