diff --git a/src/resources/objects/Buff.java b/src/resources/objects/Buff.java
index de6081da..8fc02fb4 100644
--- a/src/resources/objects/Buff.java
+++ b/src/resources/objects/Buff.java
@@ -116,19 +116,14 @@ public class Buff implements IListObject {
 		IoBuffer buffer = bufferPool.allocate(28, false).order(ByteOrder.LITTLE_ENDIAN);
 		
 		buffer.putInt(CRC.StringtoCRC(buffName.toLowerCase()));
-		if(duration < 1) {
 		if(duration > 0) {
 			buffer.putInt((int) (totalPlayTime + getRemainingDuration()));		
 			buffer.putInt(0);
 			buffer.putInt((int) duration);
 		} else {
 			buffer.putInt(-1);
-           		 buffer.putInt(0);
+           	buffer.putInt(0);
 			buffer.putInt(0);
-		} else {
-			buffer.putInt((int) (totalPlayTime + getRemainingDuration()));		
-			buffer.putInt(0);
-			buffer.putInt((int) duration);
 		}
 		buffer.putLong(ownerId);
 		buffer.putInt(1);	// unk
diff --git a/src/services/BuffService.java b/src/services/BuffService.java
index 52f982c8..a26d3912 100644
--- a/src/services/BuffService.java
+++ b/src/services/BuffService.java
@@ -86,7 +86,6 @@ public class BuffService implements INetworkDispatch {
         }	
 			
 		
-		if (FileUtilities.doesFileExist("scripts/commands/" + buffName + ".py")) buffName = "buff_" + buffName;
 		core.scriptService.callScript("scripts/buffs", "setup", buffName, core, creature, buff);
 		
 		creature.addBuff(buff);
@@ -105,17 +104,15 @@ public class BuffService implements INetworkDispatch {
 			}, (long) buff.getDuration(), TimeUnit.SECONDS);
 		}
 		
-	} }
+	} 
 	
 	public void removeBuffFromCreature(CreatureObject creature, Buff buff) {
 		
 		 if(!creature.getBuffList().contains(buff))
              return;
             
-             String buffName = buff.getBuffName();
-             if (FileUtilities.doesFileExist("scripts/commands/" + buffName + ".py")) buffName = "buff_" + buffName;
-             core.scriptService.callScript("scripts/buffs", "removeBuff", buffName, core, creature, buff);
-             creature.removeBuff(buff);
+         core.scriptService.callScript("scripts/buffs", "removeBuff", buff.getBuffName(), core, creature, buff);
+         creature.removeBuff(buff);
 		
 	}