Tim's changes; removed some remaining non-functional ifdefs