ncm-cdispd code cleanup

Work in progress related to #8...

Discussion on cleanup goals is better placed in #8.
You are right... but this is a mod I did yesterday. Until now it was adding inactive component thus the legacy check! I'll remove it.