removed duplicate code
Merge pull request #1206 from andreistefanescu/master

removed duplicate code
Revert "simplification in substitution and function evaluation"
Merge pull request #1208 from kframework/revert-1205-master

Revert "simplification in substitution and function evaluation"
Revert "Revert "simplification in substitution and function evaluation""
Merge pull request #1209 from kframework/revert-1208-revert-1205-master

Revert "Revert "simplification in substitution and function evaluation""