Removed old loading code