Disk plugin and some clean ups