Clean up some disabled code related to cpu features