Switch to new music fetchers.
Clean up unused array
Fix song count.