removed the use of 'AlgorithmToType' dictionary.