Model / Entity cleanup