moved condition for optional metrics into calculator's config and deleted reDefineCalulator method