Cleaning up package references