~dricottone/nspotify

Noted one more TODO
Cleanup remaining TODOs