fixed problem with use of obsolete eval-when situations; removed dead code