Cleaned up drive class, removed redundant code.