--- deliantra/server/include/object.h	2006/12/06 13:59:01	1.47
+++ deliantra/server/include/object.h	2006/12/12 20:53:03	1.48
@@ -317,8 +317,6 @@
 
 // compatibility functions/macros
 #define get_object() object::create ()
-#define free_object(op) (op)->destroy (0)
-#define free_object2(op, free_inv) (op)->destroy (free_inv)
 #define clear_owner(op) (op)->owner = 0
 #define copy_owner(op,other) (op)->owner = (other)->owner
 #define get_owner(op) (op)->owner
@@ -330,12 +328,6 @@
   op->set_owner (owner);
 }
 
-static inline void
-remove_ob (object *op)
-{
-  op->remove ();
-}
-
 #define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
 
 typedef struct oblnk