cleanup 2.0 rc