final 2.5 file cleanup 899