Implemented delete fix for other entities