More cleanup in preparation for 3.0 release