~dricottone/nspotify

Cleanup remaining TODOs