Clean up DynamicEntity