component model cleanup