Revert "Revert "test remove""

This reverts commit 4107837a4e4c1f744351640c2f0cd8c118095e7e.