Revert "Sounds cleanup"

This reverts commit b04c57ba980793c43b79c9d889e94e3cd164e8ad.
150 files changed