Add static remove and removeOne