Removing defunct ad-hoc token attributes