Simplified some CPP
Fix build with current conduit