Removed separate driver