cleanup sound

Change-Id: I9a150cdf2e600f15763c5cbde26ff338e4d8d73c