Comment out unused things for 0.1