Removed old ported code