Remove cbuffer and add fix-cpath modules