Source cleanup before 2.0 release