NMS removal and compatibility with newest BKC

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