Simplification of the risk calculators

By making use of the new features in commonlib it is possible to throw away several line of codes in the engine.