Cleaned up drive