modeling cleanup