Remove unused service
Re-arrange loading order
Merge branch 'music-branch' into prod