Removed old manual code