Added file storage cleanup on entity deletion