Cleanup pick-songs a little