Revert "fixed multiple entity removable bug"

This reverts commit 55236ab44b59e6c5a3d69838bc7723645ae57211.