Revert "Fix remove()"

This reverts commit 15a4cc5696e7f92d614be998e395f05bfaf7c3e1.
Revert "Fix remove()"

This reverts commit 4e47be91586af751a5bb4d91cb7e8f8daac451ca.
Fix remove