warnings/dead code removal
make CfInfo a static inner class