Removed more old loading code