removed some old #ifdeffed-out code