diff --git a/files/templates/comments.html b/files/templates/comments.html
index d5a1e6c1c..8c7beead3 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -208,12 +208,6 @@
 				{% endfor %}
 			</div>
 		{% elif replies %}
-			<div id="replies-of-{{c.id}}" class="d-none d-md-block">
-				{% set standalone=False %}
-				{% for reply in replies %}
-					{{single_comment(reply, level=level+1)}}
-				{% endfor %}
-			</div>
 			<div id="morecomment-{{c.id}}" class="d-md-none mt-2 more-comments text-small">
 				<a {% if v %}href="{{c.permalink}}?context=10#context"{% else %}href="/logged_out{{c.permalink}}?context=10#context"{% endif %}>More comments <i class="fas fa-long-arrow-right ml-1"></i></a>
 			</div>
@@ -378,12 +372,11 @@
 							&nbsp;
 							<small class="btn btn-secondary format d-inline-block m-0"><i class="fas fa-smile-beam" aria-hidden="true" onclick="loadEmojis('comment-edit-body-{{c.id}}')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Add Emoji"></i></small>
 							&nbsp;
-							{% if request.headers.get('cf-ipcountry')!="T1" %}
-								<label class="btn btn-secondary format d-inline-block m-0" for="file-edit-reply-{{c.id}}">
-									<div id="filename-edit-reply-{{c.id}}"><i class="far fa-image"></i></div>
-									<input id="file-edit-reply-{{c.id}}" type="file" name="file" accept="image/*" onchange="document.getElementById('filename-edit-reply-{{c.id}}').innerHTML='image';" hidden>
-								</label>
-							{% endif %}
+							
+							<label class="btn btn-secondary format d-inline-block m-0" for="file-edit-reply-{{c.id}}">
+								<div id="filename-edit-reply-{{c.id}}"><i class="far fa-image"></i></div>
+								<input id="file-edit-reply-{{c.id}}" type="file" name="file" accept="image/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="document.getElementById('filename-edit-reply-{{c.id}}').innerHTML='image';" hidden>
+							</label>
 
 							<a id="cancel-edit-{{c.id}}" href="javascript:void(0)" onclick="toggleEdit('{{c.id}}')" class="d-none d-md-block btn btn-link text-muted ml-auto cancel-form">Cancel</a> 
 							<a href="javascript:void(0)" form="comment-edit-form-{{c.id}}" class="d-none d-md-block btn btn-primary ml-2" onclick="comment_edit('{{c.id}}')">Save Edit</a> 
@@ -541,12 +534,10 @@
 							<i id="emoji-reply-btn-{{c.fullname}}" class="fas fa-smile-beam" onclick="loadEmojis('reply-form-body-{{c.fullname}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji"></i>
 						</label>
 						&nbsp;
-						{% if request.headers.get('cf-ipcountry')!="T1" %}
-							<label class="btn btn-secondary format d-inline-block m-0" for="file-upload-reply-{{c.fullname}}">
-								<div id="filename-show-reply-{{c.fullname}}"><i class="far fa-image"></i></div>
-								<input id="file-upload-reply-{{c.fullname}}" type="file" name="file" accept="image/*" onchange="document.getElementById('filename-show-reply-{{c.fullname}}').innerHTML='image';" hidden>
-							</label>
-						{% endif %}
+						<label class="btn btn-secondary format d-inline-block m-0" for="file-upload-reply-{{c.fullname}}">
+							<div id="filename-show-reply-{{c.fullname}}"><i class="far fa-image"></i></div>
+							<input id="file-upload-reply-{{c.fullname}}" type="file" name="file" accept="image/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="document.getElementById('filename-show-reply-{{c.fullname}}').innerHTML='image';" hidden>
+						</label>
 						<a href="javascript:void(0)" onclick="document.getElementById('reply-to-{{c.id}}').classList.add('d-none')" class="d-none d-md-block btn btn-link text-muted ml-auto cancel-form">Cancel</a> 
 						<a id="save-reply-to-{{c.fullname}}" class="d-none d-md-block btn btn-primary text-muted ml-2" onclick="post_comment('{{c.fullname}}', '{{c.post.id}}');" href="javascript:void(0)">Comment</a>
 					</div>
@@ -567,11 +558,6 @@
 				{% endfor %}
 			</div>
 		{% elif replies %}
-			<div id="replies-of-{{c.id}}" class="d-none d-md-block">
-				{% for reply in replies %}
-					{{single_comment(reply, level=level+1)}}
-				{% endfor %}
-			</div>
 			<div id="morecomment-{{c.id}}" class="d-md-none mt-2 more-comments text-small">
 				<a {% if v %}href="{{c.permalink}}#context"{% else %}href="/logged_out{{c.permalink}}#context"{% endif %}>More comments <i class="fas fa-long-arrow-right ml-1"></i></a>
 			</div>
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index 80e0f610d..f118e62e4 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -205,18 +205,15 @@
 
 						<div class="d-flex">
 
-							{% if request.headers.get('cf-ipcountry')!="T1" %}
-								<div>
+							<div>
+								<form action="/settings/images/profile" method="post" enctype="multipart/form-data">
+									<input type="hidden" name="formkey" value="{{v.formkey}}">
+									<label class="btn btn-secondary text-capitalize mr-2 mb-0">
+										Update<input type="file" accept="image/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} hidden name="profile" onchange="form.submit()">
+									</label>
+								</form>
 
-									<form action="/settings/images/profile" method="post" enctype="multipart/form-data">
-										<input type="hidden" name="formkey" value="{{v.formkey}}">
-										<label class="btn btn-secondary text-capitalize mr-2 mb-0">
-											Update<input type="file" hidden name="profile" onchange="form.submit()">
-										</label>
-									</form>
-
-								</div>
-							{% endif %}
+							</div>
 
 							{% if v.profileurl %}
 							<div>
@@ -250,18 +247,15 @@
 
 						<div class="d-flex">
 
-							{% if request.headers.get('cf-ipcountry')!="T1" %}
-								<div>
+							<div>
+								<form action="/settings/images/banner" method="post" enctype="multipart/form-data">
+									<input type="hidden" name="formkey" value="{{v.formkey}}">
+									<label class="btn btn-secondary text-capitalize mr-2 mb-0">
+										Update<input type="file" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} accept="image/*" hidden name="banner" onchange="form.submit()">
+									</label>
+								</form>
 
-									<form action="/settings/images/banner" method="post" enctype="multipart/form-data">
-										<input type="hidden" name="formkey" value="{{v.formkey}}">
-										<label class="btn btn-secondary text-capitalize mr-2 mb-0">
-											Update<input type="file" hidden name="banner" onchange="form.submit()">
-										</label>
-									</form>
-
-								</div>
-							{% endif %}
+							</div>
 
 							<div>
 
@@ -576,12 +570,10 @@
 											&nbsp;
 											<pre style="padding-top:0.7rem" class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('bio-text')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji"></pre>
 											&nbsp;
-											{% if request.headers.get('cf-ipcountry')!="T1" %}
-												<label class="btn btn-secondary format d-inline-block m-0">
-													<div id="filename-show"><i class="far fa-image"></i></div>
-													<input id="file-upload" type="file" name="file" accept="image/*" onchange="document.getElementById('filename-show').innerHTML='image';" hidden>
-												</label>
-											{% endif %}
+											<label class="btn btn-secondary format d-inline-block m-0">
+												<div id="filename-show"><i class="far fa-image"></i></div>
+												<input id="file-upload" type="file" name="file" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} accept="image/*" onchange="document.getElementById('filename-show').innerHTML='image';" hidden>
+											</label>
 										</div>
 										<pre></pre>
 										<div class="d-flex">
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 5fa418277..c856b3dc6 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -832,12 +832,10 @@
 				<label class="btn btn-secondary format d-inline-block m-0" for="emoji-reply-btn-{{p.fullname}}">
 					<div id="emoji-reply-btn-{{p.fullname}}" onclick="loadEmojis('reply-form-body-{{p.fullname}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji"><i class="fas fa-smile-beam"></i></div>
 				</label> 
-				{% if request.headers.get('cf-ipcountry')!="T1" %}
-					<label class="format btn btn-secondary m-0 ml-1 {% if v %}d-inline-block{% else %}d-none{% endif %}" for="file-upload-reply-{{p.fullname}}">
-						<div id="filename-show-reply-{{p.fullname}}"><i class="far fa-image"></i></div>
-						<input id="file-upload-reply-{{p.fullname}}" type="file" name="file" accept="image/*" onchange="document.getElementById('filename-show-reply-{{p.fullname}}').innerHTML='image';" hidden>
-					</label>
-				{% endif %}
+				<label class="format btn btn-secondary m-0 ml-1 {% if v %}d-inline-block{% else %}d-none{% endif %}" for="file-upload-reply-{{p.fullname}}">
+					<div id="filename-show-reply-{{p.fullname}}"><i class="far fa-image"></i></div>
+					<input id="file-upload-reply-{{p.fullname}}" type="file" name="file" accept="image/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="document.getElementById('filename-show-reply-{{p.fullname}}').innerHTML='image';" hidden>
+				</label>
 				<a id="save-reply-to-{{p.fullname}}" href="javascript:void(0)" form="reply-to-{{p.fullname}}" class="btn btn-primary text-whitebtn ml-auto" onclick="post_comment('{{p.fullname}}', '{{p.id}}')">Comment</a>
 			</div>
 		</form>
diff --git a/files/templates/submit.html b/files/templates/submit.html
index e1ad08fe6..324769c0d 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -74,19 +74,17 @@
 														<input class="form-control" id="post-URL" aria-describedby="URLHelp" name="url" placeholder="Optional if you have text." value="{{request.values.get('url','')}}" required oninput="checkForRequired();autoSuggestTitle();hide_image()">
 														<small class="form-text text-muted">To post an image, use a direct image link such as i.imgur.com</small>
 												</div>
-												{% if request.headers.get('cf-ipcountry')!="T1" %}
-													<div id="image-upload-block">
-														<div><label class="mt-3">Attachment Upload</label></div>
+												<div id="image-upload-block">
+													<div><label class="mt-3">Attachment Upload</label></div>
 
-														<img loading="lazy" id="image-preview" class="w-100">
-														<label class="btn btn-secondary m-0" for="file-upload">
-															<div id="filename-show">Select File</div>
-															<input id="file-upload" type="file" name="file" accept="image/*, video/*" hidden>
-														</label>
-														<small class="form-text text-muted">Optional if you have text.</small>
-														<small class="form-text text-muted">You can upload videos up to 1 minute long.</small>
-													</div>
-												{% endif %}
+													<img loading="lazy" id="image-preview" class="w-100">
+													<label class="btn btn-secondary m-0" for="file-upload">
+														<div id="filename-show">Select File</div>
+														<input id="file-upload" type="file" name="file" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} accept="image/*, video/*" hidden>
+													</label>
+													<small class="form-text text-muted">Optional if you have text.</small>
+													<small class="form-text text-muted">You can upload videos up to 1 minute long.</small>
+												</div>
 												</div>
 
 												<label for="body" class="mt-3">Text<i class="fas fa-info-circle text-gray-400 ml-1" data-bs-toggle="tooltip" data-bs-placement="top" title="" data-bs-original-title="Uses markdown. Limited to 10000 characters."></i></label>