Optimize Disk Info and add cleanup