Add remove and orphan functions