Remove "claim badges" per issue #460