remove commented junk in favor of actual junk