Perspective nag cleanup