Cleanup and prepare for libspotify