ncm-cdispd code cleanup

Work in progress...