Some cleaning up for ngxen, ngxdis and ngxcb