Comment out old characteristic-related things