Getting rid of unnecessary CREATE cpp define