Cleanup, revert unrelated change, no longer use magic numbers for STREAM_MUSIC static field