- removed old if 0'ed code