4402 strip site messages

http://bugs.dwscoalition.org/show_bug.cgi?id=4402

The commit history might be a bit horrid and messy here, but I have no idea how to fix that (I got really confused with the rebase).