some model cleanup