cleanup of Infix (removed some operators);
remove TypeClass
conversion with Gen