More cleanup from merging/adding packages