Remove uneeded synchronization
Make sure to do swapping from the correct list
Merge branch 'master' of https://github.com/daneren2005/Subsonic