temporarily removed used of __remove to work around bug