nag cleaned up