Checked and cleaned for any remaining NMS calls

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>