Remove more badge code