Riot clean up 3