Fixed up "as", removed a bunch of badge stuff.