removed dependence on CLHEP