Removed unused using statements
fixed compile issues
Disk scan is much much much much faster.