Final erasure of NMS/CB and started using Interpolated Map

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