Fix removing of created entities for shares