(maint) Fix stale comments and remove commented out code.