Removing duplicated self reference