diff --git a/src/main.rs b/src/main.rs
index 8690bd4..f5211d9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,7 @@ use axum::{
     http::{Request, Response, StatusCode},
     middleware::{self, Next},
     response::{Html, IntoResponse, Redirect},
-    routing::{delete, get, post},
+    routing::{get, post},
     Json, Router, TypedHeader,
 };
 
@@ -91,8 +91,7 @@ async fn main() -> io::Result<()> {
         .route("/records", get(records))
         .route("/records/links", get(records_links))
         .route("/download/:id", get(download))
-        .route("/link/:id", get(link))
-        .route("/link/:id", delete(link_delete))
+        .route("/link/:id", get(link).delete(link_delete))
         .route("/link/:id/remaining", get(remaining))
         .layer(DefaultBodyLimit::disable())
         .layer(RequestBodyLimitLayer::new(
@@ -178,7 +177,10 @@ async fn link(
     {
         let mut records = state.records.lock().await;
 
-        if let Some(record) = records.get_mut(&id) {
+        if let Some(record) = records
+            .get_mut(&id)
+            .filter(|record| record.can_be_downloaded())
+        {
             if record.can_be_downloaded() {
                 return Ok(Html(leptos::ssr::render_to_string({
                     let record = record.clone();
@@ -292,11 +294,10 @@ async fn upload_to_zip(
 async fn download(
     axum::extract::Path(id): axum::extract::Path<String>,
     headers: HeaderMap,
-    State(mut state): State<AppState>,
+    State(state): State<AppState>,
 ) -> Result<axum::response::Response, (StatusCode, String)> {
     {
         let mut records = state.records.lock().await;
-        tracing::info!("{headers:?}");
         if headers.get("hx-request").is_some() {
             return Ok(axum::http::Response::builder()
                 .header("HX-Redirect", format!("/download/{id}"))
@@ -306,23 +307,23 @@ async fn download(
                 .into_response());
         }
 
-        if let Some(record) = records.get_mut(&id) {
-            if record.can_be_downloaded() {
-                record.downloads += 1;
+        if let Some(record) = records
+            .get_mut(&id)
+            .filter(|record| record.can_be_downloaded())
+        {
+            record.downloads += 1;
 
-                let file = tokio::fs::File::open(&record.file).await.unwrap();
+            let file = tokio::fs::File::open(&record.file).await.unwrap();
 
-                return Ok(axum::response::Response::builder()
-                    .header("Content-Type", "application/zip")
-                    .body(StreamBody::new(ReaderStream::new(file)))
-                    .unwrap()
-                    .into_response());
-            }
+            return Ok(axum::response::Response::builder()
+                .header("Content-Type", "application/zip")
+                .body(StreamBody::new(ReaderStream::new(file)))
+                .unwrap()
+                .into_response());
+        } else {
+            records.remove_record(&id).await.unwrap()
         }
     }
 
-    // TODO: This....
-    state.remove_record(&id).await.unwrap();
-
     Ok(Redirect::to("/404.html").into_response())
 }
diff --git a/src/state.rs b/src/state.rs
index 4908ba4..f5fc221 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -1,5 +1,6 @@
 use std::{
-    collections::HashMap,
+    collections::{hash_map::Entry, HashMap},
+    io::ErrorKind,
     path::{Path, PathBuf},
     sync::Arc,
 };
@@ -72,26 +73,25 @@ pub trait AsyncRemoveRecord {
 impl AsyncRemoveRecord for AppState {
     async fn remove_record(&mut self, id: &String) -> Result<(), std::io::Error> {
         let mut records = self.records.lock().await;
-
-        if let Some(record) = records.get_mut(id) {
-            tokio::fs::remove_file(&record.file).await?;
-            records.remove(id);
-            cache::write_to_cache(&records).await?;
-        }
-
-        Ok(())
+        records.remove_record(id).await
     }
 }
 
 #[async_trait]
 impl AsyncRemoveRecord for HashMap<String, UploadRecord> {
     async fn remove_record(&mut self, id: &String) -> Result<(), std::io::Error> {
-        if let Some(record) = self.get_mut(id) {
-            tokio::fs::remove_file(&record.file).await?;
-            self.remove(id);
-            cache::write_to_cache(&self).await?;
-        }
+        match self.entry(id.clone()) {
+            Entry::Occupied(entry) => {
+                tokio::fs::remove_file(&entry.get().file).await?;
+                entry.remove_entry();
+                cache::write_to_cache(&self).await?;
 
-        Ok(())
+                Ok(())
+            }
+            Entry::Vacant(_) => Err(std::io::Error::new(
+                ErrorKind::Other,
+                "No UploadRecord Found",
+            )),
+        }
     }
 }
diff --git a/src/views.rs b/src/views.rs
index c99fd12..6bd8290 100644
--- a/src/views.rs
+++ b/src/views.rs
@@ -91,7 +91,7 @@ pub fn LinkView(cx: Scope, id: String, record: UploadRecord) -> impl IntoView {
         cx,
         <div class="column-container">
             <div class="link-wrapper">
-                <a id="link" hx-get="/download/{id}" href="/download/{id}">Download Now!</a>
+                <a id="link" href="/download/{id}">Download Now!</a>
             </div>
 
             <div class="link-wrapper" hx-get="/link/{id}/remaining" hx-trigger="click from:#link delay:0.2s, every 10s" >