More cleanup and package deprecation.