Cleaned up sndriver leftovers