modify to remove EVAL-WHEN forms which are not needed now