cleanup 2.5