Riot clean up 2