Clean-up metadata