Removing more sounds. Sortening sounds class.