Cleanup
updates (random+playlist)
merge