3.10.0
minor cleanup in prep for 4.0