minor cleanup, preparing for 3.0.1