Port disk usage
Optimize sanity checker