Uncommented the metadata removal query