Code clean-up
Properly declare app as being music player
Remove old code