Fixed bug with drive length on Mac
Removed useless code