Revert "abstracting cpt creation"

This reverts commit c62194375c804c55257a8f0e9f23d082c1ae615e.