Removed old #if 0'd code that shouldn't have been present