Removed unused defmethod's