Remove some debug stuff I inadvertently left in and remove some confusing comments