cleanup for next model version