model cleanup based on requirements