diff --git a/src/client/js/components/inventory.js b/src/client/js/components/inventory.js
index e286f47f..59a07b3c 100644
--- a/src/client/js/components/inventory.js
+++ b/src/client/js/components/inventory.js
@@ -9,13 +9,6 @@ define([
 		items: [],
 
 		init: function (blueprint) {
-			this.items.forEach(function (i) {
-				if ((i.stats) && (i.stats.hpMax)) {
-					i.stats.vit = i.stats.hpMax;
-					delete i.stats.hpMax;
-				}
-			});
-
 			events.emit('onGetItems', this.items);
 		},
 		extend: function (blueprint) {
@@ -35,11 +28,6 @@ define([
 					var nItem = newItems[i];
 					var nId = nItem.id;
 
-					if ((nItem.stats) && (nItem.stats.hpMax)) {
-						nItem.stats.vit = nItem.stats.hpMax;
-						delete nItem.stats.hpMax;
-					}
-
 					var findItem = items.find(function (item) {
 						return (item.id == nId);
 					});
diff --git a/src/client/js/misc/statTranslations.js b/src/client/js/misc/statTranslations.js
index fb37df42..aaedd562 100644
--- a/src/client/js/misc/statTranslations.js
+++ b/src/client/js/misc/statTranslations.js
@@ -5,7 +5,6 @@ define([
 ) {
 	var stats = {
 		'vit': 'vitality',
-		'hpMax': 'vitality',
 		'regenHp': 'health regeneration',
 		'manaMax': 'maximum mana',
 		'regenMana': 'mana regeneration',
diff --git a/src/client/ui/templates/equipment/equipment.js b/src/client/ui/templates/equipment/equipment.js
index 8b1a36e5..0c512b5c 100644
--- a/src/client/ui/templates/equipment/equipment.js
+++ b/src/client/ui/templates/equipment/equipment.js
@@ -332,7 +332,8 @@ define([
 					gap3: '',
 					str: stats.str,
 					int: stats.int,
-					dex: stats.dex
+					dex: stats.dex,
+					vit: stats.vit
 				},
 				offense: {
 					'crit chance': (~~(stats.critChance * 10) / 10) + '%',
diff --git a/src/server/components/equipment.js b/src/server/components/equipment.js
index 84325c81..a5f70d02 100644
--- a/src/server/components/equipment.js
+++ b/src/server/components/equipment.js
@@ -146,9 +146,6 @@ define([
 			for (var s in stats) {
 				var val = stats[s];
 
-				if (s == 'hpMax')
-					s = 'vit';
-
 				this.obj.stats.addStat(s, val);
 			}
 
@@ -221,8 +218,6 @@ define([
 			for (var s in stats) {
 				var val = stats[s];
 
-				if (s == 'hpMax')
-					s = 'vit';
 				this.obj.stats.addStat(s, -val);
 			}
 
diff --git a/src/server/components/inventory.js b/src/server/components/inventory.js
index f107c2d8..470783da 100644
--- a/src/server/components/inventory.js
+++ b/src/server/components/inventory.js
@@ -43,27 +43,6 @@ define([
 				if ((item.pos >= this.inventorySize) || (item.eq))
 					delete item.pos;
 
-				//Hacks for old items
-				if (((item.spell) && (!item.spell.rolls)) || (!item.sprite)) {
-					items.splice(i, 1);
-					i--;
-					iLen--;
-					continue;
-				} else if ((item.spell) && (item.type == 'Spear')) {
-					item.spell.properties = item.spell.properties || {};
-					item.spell.properties.range = item.range;
-				} else if (item.quantity == NaN)
-					item.quantity = 1;
-				else if ((item.effects) && (Object.keys(item.effects[0]).length == 0)) {
-					items.splice(i, 1);
-					i--;
-					iLen--;
-					continue;
-				} else if (((item.slot != 'twoHanded') && (item.slot != 'oneHanded')) && (item.spell) && (!item.ability))
-					delete item.spell;
-				else if (item.slot == 'mainHand')
-					item.slot = 'oneHanded';
-
 				while (item.name.indexOf(`''`) > -1) {
 					item.name = item.name.replace(`''`, `'`);
 				}
diff --git a/src/server/components/stats.js b/src/server/components/stats.js
index 6407ca0c..84c2b014 100644
--- a/src/server/components/stats.js
+++ b/src/server/components/stats.js
@@ -32,6 +32,7 @@ define([
 		critMultiplier: 150,
 		armor: 0,
 		dmgPercent: 0,
+		vit: 0,
 
 		blockAttackChance: 0,
 		blockSpellChance: 0,
@@ -173,10 +174,10 @@ define([
 		},
 
 		addStat: function (stat, value) {
-			if (['lvlRequire', 'vit', 'allAttributes'].indexOf(stat) == -1)
+			if (['lvlRequire', 'allAttributes'].indexOf(stat) == -1)
 				this.values[stat] += value;
 
-			var sendOnlyToSelf = (['hp', 'hpMax', 'mana', 'manaMax'].indexOf(stat) == -1);
+			var sendOnlyToSelf = (['hp', 'hpMax', 'mana', 'manaMax', 'vit'].indexOf(stat) == -1);
 
 			this.obj.syncer.setObject(sendOnlyToSelf, 'stats', 'values', stat, this.values[stat]);
 
@@ -614,6 +615,9 @@ define([
 		},
 
 		rescale: function (level, isMob) {
+			if (level >= this.values.level)
+				return;
+
 			var sync = this.obj.syncer.setObject.bind(this.obj.syncer);
 
 			var oldHp = this.values.hp;
@@ -653,8 +657,6 @@ define([
 			var addStats = this.obj.equipment.rescale(level);
 			for (var p in addStats) {
 				var statName = p;
-				if (statName == 'hpMax')
-					statName = 'vit';
 
 				this.addStat(statName, addStats[p]);
 			}
diff --git a/src/server/config/maps/tutorial/zone.js b/src/server/config/maps/tutorial/zone.js
index 4b9f09bc..dc8aff98 100644
--- a/src/server/config/maps/tutorial/zone.js
+++ b/src/server/config/maps/tutorial/zone.js
@@ -363,7 +363,7 @@ module.exports = {
 						slot: 'neck',
 						type: 'Pendant',
 						noSalvage: true,
-						stats: ['hpMax', 'regenHp', 'regenMana']
+						stats: ['vit', 'regenHp', 'regenMana']
 					}]
 				}
 			}
diff --git a/src/server/config/prophecies/titangrip.js b/src/server/config/prophecies/titangrip.js
index 52e14d3b..409ae8d9 100644
--- a/src/server/config/prophecies/titangrip.js
+++ b/src/server/config/prophecies/titangrip.js
@@ -23,8 +23,6 @@ define([
 				for (var s in stats) {
 					var val = stats[s];
 
-					if (s == 'hpMax')
-						s = 'vit';
 					this.obj.stats.addStat(s, val);
 				}
 			},
@@ -36,8 +34,6 @@ define([
 				for (var s in stats) {
 					var val = stats[s];
 
-					if (s == 'hpMax')
-						s = 'vit';
 					this.obj.stats.addStat(s, -val);
 				}
 			}
diff --git a/src/server/items/generators/names.js b/src/server/items/generators/names.js
index 1b9250ad..870b5530 100644
--- a/src/server/items/generators/names.js
+++ b/src/server/items/generators/names.js
@@ -1,7 +1,7 @@
 define([
 	'../config/prefixes',
 	'../config/suffixes'
-], function(
+], function (
 	prefixes,
 	suffixes
 ) {
@@ -13,7 +13,7 @@ define([
 			['gPrefix', 'gSuffix']
 		],
 		prefixes: {
-			hpMax: 'Healthy',
+			vit: 'Healthy',
 			regenHp: 'Regenerating',
 			manaMax: `Caster's`,
 			regenMana: 'Tapping',
@@ -46,7 +46,7 @@ define([
 			lvlRequire: 'Elementary'
 		},
 		suffixes: {
-			hpMax: 'Health',
+			vit: 'Health',
 			regenHp: 'Regeneration',
 			manaMax: 'Mana',
 			regenMana: 'Orbs',
@@ -94,10 +94,10 @@ define([
 			gen.forEach(g => this.types[g].call(this, item, blueprint));
 		},
 		types: {
-			basic: function(item, blueprint) {
+			basic: function (item, blueprint) {
 				item.name = item.type;
 			},
-			prefix: function(item, blueprint) {
+			prefix: function (item, blueprint) {
 				var maxStat = '';
 				var maxValue = 0;
 				for (var s in item.stats) {
@@ -109,7 +109,7 @@ define([
 
 				item.name = this.prefixes[maxStat] + ' ' + item.name;
 			},
-			suffix: function(item, blueprint) {
+			suffix: function (item, blueprint) {
 				var stats = [];
 				for (var s in item.stats) {
 					if (this.suffixes[s])
@@ -126,7 +126,7 @@ define([
 
 				item.name = item.name + ' of ' + this.suffixes[stats[useIndex].stat];
 			},
-			gPrefix: function(item, blueprint) {
+			gPrefix: function (item, blueprint) {
 				var list = prefixes.generic.concat(prefixes.slots[item.slot] || []);
 
 				if (item.stats.armor)
@@ -142,7 +142,7 @@ define([
 					item.name = item.name.split('%').join(replacer);
 				}
 			},
-			gSuffix: function(item, blueprint) {
+			gSuffix: function (item, blueprint) {
 				var list = null;
 
 				if (item.slot == 'tool') {
@@ -161,4 +161,4 @@ define([
 			}
 		}
 	};
-});
\ No newline at end of file
+});
diff --git a/src/server/items/generators/stats.js b/src/server/items/generators/stats.js
index 83cef709..ee2d9843 100644
--- a/src/server/items/generators/stats.js
+++ b/src/server/items/generators/stats.js
@@ -57,7 +57,7 @@ define([
 					return max * perfection * (blueprint.statMult.addCritChance || 1);
 			},
 
-			hpMax: function (item, level, blueprint, perfection, calcPerfection) {
+			vit: function (item, level, blueprint, perfection, calcPerfection) {
 				var div = 1 / 11;
 				if (item.slot == 'twoHanded')
 					div *= 2;
@@ -67,9 +67,9 @@ define([
 				if (calcPerfection)
 					return (calcPerfection / max);
 				else if (perfection == null)
-					return random.norm(1, max) * (blueprint.statMult.hpMax || 1);
+					return random.norm(1, max) * (blueprint.statMult.vit || 1);
 				else
-					return max * perfection * (blueprint.statMult.hpMax || 1);
+					return max * perfection * (blueprint.statMult.vit || 1);
 			},
 
 			mainStat: function (item, level, blueprint, perfection, calcPerfection) {
@@ -137,8 +137,8 @@ define([
 		},
 
 		stats: {
-			hpMax: {
-				generator: 'hpMax'
+			vit: {
+				generator: 'vit'
 			},
 			regenHp: {
 				generator: 'regenHp'
diff --git a/src/server/mods/class-necromancer/index.js b/src/server/mods/class-necromancer/index.js
index 76a30682..5f20302b 100644
--- a/src/server/mods/class-necromancer/index.js
+++ b/src/server/mods/class-necromancer/index.js
@@ -88,7 +88,7 @@ define([
 			classes.spells.necromancer = ['summon skeleton', 'blood barrier'];
 			classes.stats.necromancer = {
 				values: {
-					hpMax: 95
+					hpMax: 65
 				},
 				vitScale: 10,
 				gainStats: {