more code cleanup, sound/Sound refs