diff --git a/builder.js b/builder.js
index 9092295..62f1a8c 100644
--- a/builder.js
+++ b/builder.js
@@ -91,6 +91,10 @@ let powderInputs = [
 function populateItemList(type) {
     let item_list = document.getElementById(type+"-items");
     for (const item of itemLists.get(type)) {
+        let item_obj = itemMap.get(item);
+        if (item_obj["restrict"] && item_obj["restrict"] === "DEPRECATED") {
+            continue;
+        }
         let el = document.createElement("option");
         el.value = item;
         item_list.appendChild(el);
@@ -132,6 +136,10 @@ function init() {
     let ring1_list = document.getElementById("ring1-items");
     let ring2_list = document.getElementById("ring2-items");
     for (const ring of itemLists.get("ring")) {
+        let item_obj = itemMap.get(ring);
+        if (item_obj["restrict"] && item_obj["restrict"] === "DEPRECATED") {
+            continue;
+        }
         let el1 = document.createElement("option");
         let el2 = document.createElement("option");
         el1.value = ring;
@@ -146,6 +154,10 @@ function init() {
     let weapon_list = document.getElementById("weapon-items");
     for (const weaponType of weaponTypes) {
         for (const weapon of itemLists.get(weaponType)) {
+            let item_obj = itemMap.get(weapon);
+            if (item_obj["restrict"] && item_obj["restrict"] === "DEPRECATED") {
+                continue;
+            }
             let el = document.createElement("option");
             el.value = weapon;
             weapon_list.appendChild(el);
diff --git a/query.js b/query.js
index 133ee22..3519853 100644
--- a/query.js
+++ b/query.js
@@ -4,6 +4,9 @@ class NameQuery {
     constructor(string) { this.queryString = string.toLowerCase(); }
 
     filter(item) {
+        if (item.get("restrict") && item.get("restrict") === "DEPRECATED") {
+            return false;
+        }
         return (item.get("displayName").toLowerCase().includes(this.queryString));
     }
 
diff --git a/skillpoints.js b/skillpoints.js
index 29f1e75..1daa896 100644
--- a/skillpoints.js
+++ b/skillpoints.js
@@ -52,8 +52,8 @@ function calculate_skillpoints(equipment, weapon) {
         let total = 0;
         for (let i = 0; i < 5; i++) {
             if (item.get("skillpoints")[i] < 0 && skillpoint_min[i]) {
-                unadjusted = skillpoints[i] + item.get("skillpoints")[i];
-                delta = skillpoint_min[i] - unadjusted;
+                const unadjusted = skillpoints[i] + item.get("skillpoints")[i];
+                const delta = skillpoint_min[i] - unadjusted;
                 if (delta > 0) {
                     applied[i] += delta;
                     total += delta;
@@ -78,10 +78,14 @@ function calculate_skillpoints(equipment, weapon) {
                 const new_bonus = sets[setName].bonuses[setCount];
                 //let skp_order = ["str","dex","int","def","agi"];
                 for (const i in skp_order) {
-                    const delta = (new_bonus[skp_order[i]] || 0) - (old_bonus[skp_order[i]] || 0);
-                    if (delta < 0 && skillpoint_min[i]) {
-                        applied[i] -= delta;
-                        total -= delta;
+                    const set_delta = (new_bonus[skp_order[i]] || 0) - (old_bonus[skp_order[i]] || 0);
+                    if (set_delta < 0 && skillpoint_min[i]) {
+                        const unadjusted = skillpoints[i] + set_delta;
+                        const delta = skillpoint_min[i] - unadjusted;
+                        if (delta > 0) {
+                            applied[i] += delta;
+                            total += delta;
+                        }
                     }
                 }
             }