Cleanup and normalise some packages