Cleaning up some packages