Removed old references to _Disk