Removed unused defmacro