metadata & shield cleanup