cleaned up NPEs