Hopefully fixing metadata & removing cruft.