Comment out incomplete, unused subs