use  PRODCOMMON_0_12_18_CRAB_58 fixes #956
cleanup a bit of mess
Merge pull request #957 from belforte/master

fixes #955 #956