cleanup 3.5